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

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