DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472  -s ours am: e0316fc7a8
am: bfdf9592d0

Change-Id: I2ceb67ac584b8fe681ffcb812ebff2f8d7ae721e