Merge "Remove unneeded uses of else{} in api/"