Merge "Signed Integer Overflow in DuckerCalcEnergy()" am: 78f80da872
am: efe7d49245

Change-Id: I0b490ebc34b9fe4f0e041e2b50bc19bad7cf7d6b