Merge "Fix low probability deadlock"
am: bb5cbc539f

Change-Id: Ife7dd96618b75fd492aaf0397870653d63cf0d5e