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

Change-Id: I4760315a5bd640b5a1e2be2cd5b4160d9086340f