Merge "Remove string power_charging_duration_short" into oc-mr1-dev