Merge changes I0f7e3578,Ie50dd642

* changes:
  WiFiDirectDemo: fix no peer in list after m-release
  WiFiDirectDemo: fix broken sample code