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 am: 0d05028ba8 am: 2f7756f4c9  -s ours am: ea7fa85a0d
am: c4cabe1896

Change-Id: I978f3d9b969089e16b4bf709e4ca3be60fbb2232