Merge "Add return value spec and fix typo."