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

Change-Id: I66ddeab0f0f2fa3d3f3fff71a20cd0b842c2f9d6