Merge "Sensors: Add additional info to sensor stats files" into marshmallow-cts-dev