Merge "Synchronize on mImsPhone to avoid NPE" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 20:54:29 +0000 (20:54 +0000)]

Trivial merge