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

Change-Id: If2389e3de3f5b511ed0ac7cee1025ec2d31cbabc