Merge "Add new wifi nearby devices app-ops"