Merge "Remove IShardableTest from SideloadOtaStabilityTest"