am 769e132a: Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1

* commit '769e132ae30b6615353dd6bd7d8779b6ef1b0b31':
  b/4080388 Improving the performance of ZoomManager