Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am: defdb1fd70

Change-Id: I6878ca92b2bd8b2e9569147dde007ae657adc87c