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

Change-Id: I80ef33d8f0593fa723077e91a5ca406f27b0b746