Fails with Icac63051bf37c7355e661837b57c257d58c764fc reverted. Change-Id: I460d7a5a74faa4daace25f911f8dc5f68e16c951