Merge "Adding null check for IResourceManagerClient in dump()"