am d7d51a60: Merge "Revert "Remove incorrect return value read""

* commit 'd7d51a60e389c250b717227fee5b97350c92426d':
  Revert "Remove incorrect return value read"