Add functionality to hi-perf WifiLocks
am: 3c0ff6add9

Change-Id: I7c94a83f611ff4e891d4d234ac9796e1fb655f44