am 9666d3c0: am 750600a1: Merge "Single track optimization" into gingerbread

Merge commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698'

* commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698':
  Single track optimization