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

Change-Id: Ieaf58a651f3bd15ee49d81fea3f118331e908cd7