Merge "Prevent overflow in usac filters" am: 4053380094
am: eaad782db3

Change-Id: I86ee269643f3247138c71ffe88a2a589bfce0357