Merge "Remove deprecated API for sim authentication." into nyc-dev