Merge "Removed the unused RIL constant" into nyc-dev