Merge "Revert "Remove getStatus from Return<*>.""