Merge "Prevent energy overflow in acelp calc_period_factor()"
am: eb9319afb2

Change-Id: Ic02c1abe8a36b5860242a8a475a68c3012c3873d