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

Change-Id: I9c347978011b65075b33146d268f3dc579170733