Merge "Add additional data elements into scan results" into tm-mainline-prod