DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171
am: f645010092  -s ours

Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368