Merge "Add three more wifi APIs." into pi-dev
am: ba6539382a

Change-Id: Ifa37e895756fa30faa20fc6284375e3c22a2810c