DO NOT MERGE: Fix CTS regression am: 7a92dc9d am: 14abf736 am: 2df9864b -s ours am: 0bbdc37b am: 25782fae Change-Id: I9fe008924b75ac7d348e0aa8c478f859a4ed743b