Merge "Fix deadlock which causing ANR"
am: 4b2247d506

Change-Id: I1a74685364f63255607c78d2a16329b88e39de90