am 72264cf8: Merge "Fix Telephony Tests" into honeycomb

* commit '72264cf810ede4c98a3de4270bc285529ad92344':
  Fix Telephony Tests