Merge "Remove string power_charging_duration_short" into oc-mr1-dev
am: 367838be4f

Change-Id: Ied709698c4f26958ecaadfd5511af814685df53c