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

Change-Id: I245e257deb8febb49f2abd7322eb3a24db564b31