Merge "Cleanup some incorrect return annotations"