DO NOT MERGE: Fix CTS regression am: df17644d am: 057b5481 am: f6450100 -s ours am: 6489d870 -s ours am: 2dbb6459 Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4