am 50acd731: am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev

* commit '50acd73173e5ca68db0a4cc01e75a2faef86b2fb':
  Support Wifi display devices that rename themselves.