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

* commit '372161b7555ccd8ba9ef9b63d5a01740ddda4308':
  b/4080388 Improving the performance of ZoomManager