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

* commit '0f736495ff243d6282693b113fe5c76e8a1a9457':
  Split increments to silence a compiler warning.

Change-Id: I4485ce044a9b8455bf3d32e62690e02cf0a64d53