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

Change-Id: Ife9502a444f46d6327e08248833814bd2357d7a2