Merge "Add a mechanism to pass the L2Key and group hint to IpClient" into qt-dev am: 7c0d309886
am: 1e252837c8

Change-Id: I58c232a6efc95a3d1abd91c5026f2e067e0cda45