This change somehow went missing from the vfork change. Change-Id: I807a2072080eac20601c694e85ba5723220289d8 (cherry picked from commit 9eae8405)