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

Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4