Merge change 6146 into donut

* changes:
  Fixing 1949086 Sholes telephony crash after waking from sleep.