Merge "Add a test configuration for output of metadata" into nougat-cts-dev