Merge "Additional alarm sounds for N" into nyc-dev