DO NOT MERGE: Fix CTS regression am: 7a92dc9d99
am: 14abf736c8

Change-Id: I2a35f4853aa450ccc68862c166b6139ce67a1aad