DO NOT MERGE: Fix CTS regression
am: df17644db7

Change-Id: Id9bed3c68661176a72bcb606e0fc0a026173ac22