Merge "Add L2 selector options to connectivity intents"