am 7bb89cf1: Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev

* commit '7bb89cf1632da6dc236e6603c4245301500eeb39':
  Cure narcolepsy.
  Allow applications to connect to known wifi displays.