am 781bcd68: am c3ee1d9a: am 7ad885e2: Merge "One more fix for incorrect indices."

# By Stephen Hines
# Via Android Git Automerger (2) and others
* commit '781bcd68ce7d701f5d36dd0d1b07d51ef937f0bc':
  One more fix for incorrect indices.