Related: I43cd55c9395f2c706369afe1a9a7f475be47339f (osmo-ci) Related: I5964979b3db86268f6011df0afbee7131557f405 (osmo-ci) Change-Id: I7a651bb85861de4b2677a731b9f17fa0d790c621