Merge proposals dependent on lp://qastaging/~asac/phablet-tools/wait-for-online-with-nm-tool

1. wait-for-online-with-nm-tool
2. Dependent merge proposals