Merge \"use an observer for the default sound\" into nyc-mr1-dev
am: 4e4d325b56

Change-Id: Iae7822d0e0282ac9be691a4f26dbc7f8751e02f9