Merge "Use design capacity instead of full charge capacity" am: 25c2de29b9 am: a4931f9b19 am: 979a72bef0

Change-Id: I5f31eef0aa684e23773980b3121c8a5a6ae00922