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

Change-Id: I96aadaddbc5fec9588827f589b3ad7205ef09b07