DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7  -s ours
am: 204fdc49fc

Change-Id: I2e62b62badbb0c528295190cd403ce252c4afe10