DO NOT MERGE ANYWHERE: Fix P2P failure when setting WPS P2P IE
Sohani Rao [Fri, 27 Jan 2017 17:59:23 +0000 (17:59 +0000)]
am: bc88924cb5  -s ours

Change-Id: I7155ee045477d26aa0d69b12a292b04084dd911a


Trivial merge