Merge "Fix index computation for quick viewing." into nyc-dev
am: 52036c7

* commit '52036c743c1fccf004247af35e9c95e12fb0a638':
  Fix index computation for quick viewing.

Change-Id: I25b1c61ee8b162221020f10a2f1dfd4e9e8562c9