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 am: 9d79c255fc
am: 578ed6fee7

Change-Id: I502d68dbcf86cf0de160aa9a0513473e1951a0cf