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

Change-Id: Iaa2a11e1924fdcfe83ca8c8e9a7925850ceb53be