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

Change-Id: Ia2962471693b1c4302d4535a0f95dd8d914c3cb8