Merge "Merge "Merge "Merge "Merge "Capture additional information about packages" into nougat-cts-dev am: 2aa04cfdbc" into nougat-mr1-cts-dev am: c16f3cea76" into oreo-cts-dev am: 054060de38" into oreo-mr1-cts-dev am: 7a0d8d0c55" into oc-mr1-dev
am: d4ad3504aa

Change-Id: Ic2558780ae98efaec88e82580cf608275ccf30b2