Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
am: 462f29f77f

Change-Id: I0ea5702480dc7289dbad31355a6e403d39ab3c90