Merge "b/12068020 Add a way to add uniqueness to device descriptors"