Merge "Fixed Memory Overflow Errors am: 2df08015 am: 8d241ea6 am: 4af78533 am: 543a2ac8 am: c87d7fc7 am: 935c723a am: 72d2c526 am: fb4801b7 am: 4cc396da am: 79ea5841 am: 81131cd9" into oc-dr1-dev-plus-aosp