[automerger skipped] Merge "Support for hotspot client visibility." am: 81200971e1 am: 6f1bf857a6
am: 955c650a74 -s ours
am skip reason: change_id I1caeb10bc50202873e760a76b346bccd941e2574 with SHA1 aefe78c409 is in history

Change-Id: I780b28115c84a69fa826798c8f42110bf27cbcd3