am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2

* commit 'b92dcf9c062064dcca9298b089d95a3ce1ba2e75':
  Simplify spot tracking logic. Bug: 4124987