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