Merge "Update log metrics in battery usage." into main