Merge "Add new Wifi API to light grey." into pi-dev
am: 0bc998b32f

Change-Id: I9e63bdeda0f2747ba414ad152115dda45d136ca1