Merge "Fix CST test failure on non-telephony device and a couple of exceptions" into lmp-dev