Merge "UBSAN overflow in FFT"
am: f59fd73d44

Change-Id: I19c7c9e9891fb4b06cb171c4c32e9f9d399bdf1c