Merge "Support for hotspot client visibility."
am: 2b7c8937de

Change-Id: Ib52bd8e9fa9a2affdd02771c1f64e86297c50458