Merge "Removed the comment that refers to deprecated flag" into nyc-dev