Merge "Merge "Add a mechanism to pass the L2Key and group hint to IpClient"...
Merge "Merge "Add a mechanism to pass the L2Key and group hint to IpClient" am: 66d744ba am: 47c803e3" into qt-dev-plus-aosp
am: 199e67ea
Change-Id: I8b544c083f5a493786efe7a84f43a32507b089ac