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

* commit '70787fcd5c83173161159caa977fa1723c0690fc':
  Fix CST test failure on non-telephony device and a couple of exceptions