DO NOT MERGE ANYWHERE: Fix P2P failure when setting WPS P2P IE
Sohani Rao [Fri, 27 Jan 2017 18:51:56 +0000 (18:51 +0000)]
am: 05a50ffb74  -s ours

Change-Id: I8e2d89442867dd0bc43684b605ea87773e6c0e94


Trivial merge