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

# By Stephen Hines
# Via Android Git Automerger (3) and others
* commit '29449a3da7d859e8273612527949e0a200b8e798':
  One more fix for incorrect indices.