DO NOT MERGE: Fix CTS regression am: edc92385 -s ours am: 0fb1075d am: f928b806 am: 1fcc472b -s ours am: 1559998d Change-Id: Iececea055821da36f2aa7870e1c2fc04ac58e22c