DO NOT MERGE: Fix CTS regression
am: edc9238514  -s ours

Change-Id: If11ad6b402e48aebcce8afc6d5f6093bde539a6e