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

Change-Id: I184f3508fd602409d01f105500693b5d02ab37a3