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

Change-Id: I2df07a6aa02a7c56a47c777e0eacbc6d560055de