Merge "Revert behavior of loading the AssociatedDevice"