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