Merge "Eliminate deadlock in forked child due to delayed resetting mutex lock" am: 8bfaac0f8a
am: 7676c3494a

Change-Id: Iddb15d6135177028c39e9a244e9c36f9fcb4ed39