Merge "Additional alarm sounds for N" into nyc-dev
am: b97fdfa39a

* commit 'b97fdfa39afe0dd90ebfb821a839a509475fd47c':
  Additional alarm sounds for N

Change-Id: If309b5d5e1569bc5ac1dc78a4e4ff9e289af4b71