Merge "Performance improvements in AssetManager" into nyc-dev
am: 3765d34d36

* commit '3765d34d364e76817e9dbea55819df86d858df10':
  Performance improvements in AssetManager

Change-Id: Ie364041be0fb6757c2f87d5b8d570cb07452d112