Merge "Fix low probability deadlock" am: bb5cbc539f am: e05aa02d59
am: 11d3d6b7f7

Change-Id: I65a7d2e32b02386905a384d69f68bab8cde1bf95