am 89b72c36: am 66765846: Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev

* commit '89b72c3645fc2ec981e08de4a3e07f12ef0e425b':
  Enable audio streaming to a wifi display. Remove startup delay hack.