Merge "Support for hotspot client visibility."
am: 81200971e1

Change-Id: Ifadee94d1f602b9e70ba5a76731e3c990175be61