Merge "DeviceFlowRegistryImpl uses HashSet instead of ArrayList"