Merge "Bug 6146 - Some Flows not found in DeviceFlowRegistry"