Merge "Merge "Merge "DO NOT MERGE Fix MetadataReporterTest" into nougat-cts-dev am: 50c7d36f39  -s ours" into nougat-mr1-cts-dev am: dcf53cb949  -s ours"