Merge "Update the l2 and group hint identifiers for wifi network" into qt-dev