Oppo change: Charging optimizations

Change-Id: Ic191fa485dcd0811359009e3904e3fd8a493bc32