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

Change-Id: I68fa183d94f46f7578f8b0718da9a3efd9b4946c