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" am: aa2f90b5ff  -s ours am: babb21e57d  -s ours
am: fd9086d346  -s ours

Change-Id: Ic851bc200ab2af76a5acf4a99be1a9900a686326