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

Change-Id: Iacd7eff2b865515af5e29cc7fb5fb517f213aabc