Merge "Use design capacity instead of full charge capacity"