DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours
am: 204fdc49fc
Change-Id: I923456f924901516f86504ba25699ae38d1c205c
This commit is contained in: