Merge "Fix MetadataReporter tests" into nougat-cts-dev