DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8
am: 2df9864b54  -s ours

Change-Id: Ie0bc2aab0856dc6fae328571f5bc5938b43f9f49