Merge "Update AOD charging strings" into sc-dev