Merge "Fix issue #3301572: onCreateLoader must not be a member class: VolumeMetadataLoader"