Merge "UBSAN overflow in FFT" am: f59fd73d44
am: 24f0dd93fe

Change-Id: I378df5b2f7389849a368d995867620b4c51ff07c