Merge "Adding privacy tags to battery-related protos."