DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54  -s ours am: 0bbdc37b60 am: 25782fae9b
am: dd2ec80035

Change-Id: I27b22faf8d6ad4bba039a1eca699bd4163c2ad6a