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

Change-Id: I4bba155589be27ed8f5c39f5dee8b2e0c57d8566