Merge "Remove erroneously added APIs." into nyc-dev