Merge "Merge "Fix overflow check and check read result" into klp-dev am:...

Merge "Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901 am: e541fa17 am: 7f3980c0 am: ea202340 am: 3fc94bc1 am: 497f2ccc am: 91703373 am: 3b122332 am: 89cbb848 am: 3ce7b4dd am: 96fbe3c2 am: d625f8dc am: d5726329 am: 72ff5265 am: 60a16aeb" into nyc-mr2-dev-plus-aosp
am: 0976c26d

Change-Id: I5db76e52a2eb1156c23636275c1c3ea33cbf8243