Merge "Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 am: 60a16aeb56" into nyc-mr2-dev-plus-aosp
am: 0976c26d97

Change-Id: I5db76e52a2eb1156c23636275c1c3ea33cbf8243