Merge "Split increments to silence a compiler warning." am: 0f73649
am: 25b103a

* commit '25b103a4373708cf62bb346e0514d118fa96cbd7':
  Split increments to silence a compiler warning.

Change-Id: I62e0baefcebb9288e6dde9d4f954629bca6f967f