Add matching_metadata to the allowed attributes

Change-Id: Icbd68061a43d18dd27baa7ff68f9381a160cd545
Merge "Add matching_metadata to the allowed attributes"