DO NOT MERGE: Fix CTS regression am: edc9238514  -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e  -s ours am: 1559998d08 am: c3485668ad
am: 174f17bc19

Change-Id: Id47b0c1771b9fb85b874b9d7b8892d31506a842b