DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours
am: 6489d870d7  -s ours

Change-Id: I2631c56fbb3d7130b5389ed232c1a2fe0859b053