Merge commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1' * commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1': Fixing 1949086 Sholes telephony crash after waking from sleep.
Merge commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1' * commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1': Fixing 1949086 Sholes telephony crash after waking from sleep.