405005 - Code cleanup in classes using BundleFileWrapperFactoryHook

Change-Id: I078264a1d48cce48d0a23364732e8578c8eba1cb
4 files changed