Fix race bug in attemptIncStrong am: 1b07c95b74 am: 01b8097c6e
am: 6077f84b31

Change-Id: Ibbe99d8a38c678e9759c62aa2b780d2f42543c0f