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

Change-Id: Ie04b18cbf7f9d640cf314f427381ebd102c40d5e