[automerger skipped] Add functionality to hi-perf WifiLocks am: 3c0ff6add9 am: 659441c0db
am: 1a0fea3b1c -s ours
am skip reason: change_id I5d68c0376b69f9726b83fd56469e5d397845dd8d with SHA1 5feef8362f is in history

Change-Id: I7fe721b5da7b7544e8a87626203dcf0c37251703