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

Change-Id: Ic41c34a5701658aa328a83267ad3c818d55bd522