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

Change-Id: Iefb3d33a407aa719c988217b136187378617da8f