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