DO NOT MERGE: Fix CTS regression am: edc9238514  -s ours am: 0fb1075d95
am: f928b8062c

Change-Id: I92c4e992dc23f43851a9fab8479db408a89f5e89