Fix more potential (benign) AMRWB overflows

Bug: 25843966
Change-Id: I18003aa20be1ff0a93473ecd8b4995861bed8c89
2 files changed