DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a
am: b6a3e8ce8e

Change-Id: I51997dc68fc55e523050b4e642cdc4a22cd60f09