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

Change-Id: Ia85253ba6ce6bece037717b7d87955dcac4e9f81