DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours
am: 0bbdc37b60
Change-Id: If4f25ea9d5a921fb264d67137fc0af05d84e614e
This commit is contained in: