Merge "Update Summary for Battery Optimization" into oc-dev