[automerger skipped] Merge "Support for hotspot client visibility." am: 2b7c8937de am: 24546e531f
am: 1a71177bc8 -s ours
am skip reason: change_id Ife4bb5ca7bbcf075683cb0a233f2b5716ccd51d9 with SHA1 b16500d595 is in history

Change-Id: Iefb7eda2ac411de6bc4e9ecdfa26068aaafc70f8