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

Change-Id: Icf6055101947c23621ed320469c475dd105dd60f