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

Change-Id: Ic642286098aeeafe379c7f71b6a98da61fb31a21