Merge "Add AOD metrics in batterystats"