Avoid potential re-entry as a result of child mutation am: b46ba3b2b0 am: 0d98515cab
am: 762c828704

Change-Id: I41e826722759de148e3f87d31981d008ff911cfe