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

Change-Id: Ie0b8b3f4ab168f132f4f6cc01df525c69c8cde41