DO NOT MERGE: Fix CTS regression am: 90be39c7 am: db9f5045 am: b04c4289 am: e71159c5 -s ours am: 204fdc49 Change-Id: I2e62b62badbb0c528295190cd403ce252c4afe10