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

Change-Id: I4818ea8641ab937dbefb4a39810c97c3bbf5c262