Merge "Remove IPC calls from synchronized block." into oc-dr1-dev
am: 6829db0cb6

Change-Id: I0de9ba563c2e84997c5ecb10efa973974191047f