port Moto battery charge fix from ICS

Change-Id: Iaed07e682463a6467b1903ab40cf41440334b64b