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

Change-Id: I0b07f82bf5df950dd03ff93d863033ea23510186