Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b
am: 3fc94bc146

Change-Id: Ic4fd03ad338902c15048dd32e8a2f27d162d6255