Add functionality to hi-perf WifiLocks am: 3c0ff6add9
am: 659441c0db

Change-Id: I0cb8ed7512013cf8cace1a0e011377c9af57c208