Merge "Rename device ID constants."