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

# By Stephen Hines
# Via Gerrit Code Review (1) and Stephen Hines (1)
* commit '7ad885e2e6c845dbec4f16cd71e859240741dbf9':
  One more fix for incorrect indices.