fix race condition that can cause a use after free am: 59485525a6 am: 5da64c91d0 am: 46361c6c2b am: ee464e00d3
am: 21e9397776  -s ours

Change-Id: If0f229ba54f2c9978ba83beca331896d1d303db4