Merge \\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\" into lmp-dev am: 124cc534f8  -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944  -s ours am: cc154342aa
am: ee0c3b013a

Change-Id: Ic5f0abe33b51bd085a990c1d48d5c7c9eb5af8fe