Merge "Add notification ID for no random mac support"