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

Change-Id: Ic1bc071d11c42771d46ad1b2da9e9264299d5e7b