Merge "Fix bug 5159736 - Make DeviceDefault the default"