Merge "DeviceBuildDescriptor API tweaks."