Merge "target: msm8996: Move the charging after storage init"