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