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

Change-Id: I3560bd28b67fee381f6c2d9e8bc8864efe63090d