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

Change-Id: I79d4754328932612b438d50dccdb32cdbcba01b4