Merge "Fix race bug in attemptIncStrong" am: 077135b18c am: 0152d34d1f am: 61b4d9f738
am: 2281f86eb7

Change-Id: I0e5e15912aab68d1791488c3b77152fc157bb7c3