DO NOT MERGE ANYWHERE: Fix P2P failure when setting WPS P2P IE am: bc88924cb5 -s...
Sohani Rao [Fri, 27 Jan 2017 18:01:53 +0000 (18:01 +0000)]
am: 7f5713cff7  -s ours

Change-Id: I7fa1e2ecf54f74a31db02f596c0900bb6f08db62


Trivial merge