Bug: 160733170
Test: Sanity; Telephony unit tests; hard to reproduce
Change-Id: If8347a27a79351e84060c9a35e1cc9efd468f7a0
Merged-In: If8347a27a79351e84060c9a35e1cc9efd468f7a0
(cherry picked from commit 131781145d)
Bug: 160733170
Test: Sanity; Telephony unit tests; hard to reproduce
Change-Id: If8347a27a79351e84060c9a35e1cc9efd468f7a0
Merged-In: If8347a27a79351e84060c9a35e1cc9efd468f7a0
(cherry picked from commit 131781145d)