DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522
am: b04c428935

Change-Id: I5781e7822d050426288bbd42faafff31f098aa99