Merge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev am: 7415a5941b
am: 93ad5e0f88

Change-Id: If32172a299096dcaf180d43a10523a22e3b0903a