DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54  -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035
am: d056456fe2  -s ours

Change-Id: Ifb5115f0efac94fbbbb622d442bd32c49df085f5