Merge "Capture additional information about packages" into nougat-cts-dev