Merge "Merge "Audio assets: add NFC sounds" am: 5cb7cd68a0 am: 8df8455384 am: db864758c0"