Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am: f8e99e72e7

Change-Id: Id29ae90fd336657d428a15fa0730b95d717386db