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

* commit '2b798a2344feeeb64b74e8dab4042f7d7f3879ab':
  Performance improvements in AssetManager

Change-Id: I01c50ad7695e478f299f497441fdea0ab8e24116