Merge "Add uid data even though on battery stats" into oc-mr1-dev
am: 189899c169

Change-Id: If77a54cbcb8dc972297fab9779b3947aa25cf020