Avoid potential re-entry as a result of child mutation am: 66b3a0d1 am: 70ccc698 am: 992ef58a am: cc0e9d79 am: 532871d7 Change-Id: I4c9af4d3e94291233b808415bab08f34152f3c42