Merge "Include uid in batterystats logs." into sc-dev