Merge "Eliminate deadlock in forked child due to delayed resetting mutex lock" am: 8bfaac0f am: 7676c349 am: 36fac159 Change-Id: Iceab33584cb2ddd6c6565a7e5746dc6c4b2a76a3