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

Change-Id: I16587768d92201f8d4d083b70ae972cca47e8b5c