Coordinated change for extensible MetadataProvider Change-Id: Id7df08806befad531ac071163993b38b25d57847