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

Change-Id: Id1736dd6af5b656c158896f6d9fcb117231351a4