DO NOT MERGE: Fix CTS regression am: df17644db7
am: 057b548171

Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989