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

Change-Id: I0892c5ac44b026f47a8c698277f402a633e1569f