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

Change-Id: I960e31d55b6c47df345457afbd505c50afeebcfa