Merge "Add uid data even though on battery stats" into oc-mr1-dev