Merge changes I0b267429,Icba3cb63,If2090c6d

* changes:
  Resolve resource conflicts.
  Change voicemail empty state icon to voicemail icon.
  Use sensible audio route for bubble mode.