Avoid potential re-entry as a result of child mutation
am: 66b3a0d1aa

Change-Id: I1fa6619145a6aaceb4c743d378fbc5b198da6cdd