Merge "Remove incorrect return value read"