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

Change-Id: Ice33011bc5fcd9bcdc87fbf1fab3c25cb65decb4