DO NOT MERGE: Fix CTS regression
am: 7a92dc9d99

Change-Id: I13605f366810c158d380b11a814da8eac3e4e213