Merge "Add AOD metrics in batterystats" into oc-mr1-dev