Merge "Fix ANR due to long wait for synchronization lock" am: 9193014ee6
am: ad4e3c5d8b

Change-Id: Ib145ddd3769145f19387b438b55eaf495894ef4f