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

Change-Id: Iececea055821da36f2aa7870e1c2fc04ac58e22c