am c1e0015e: b/12068020 Add a way to add uniqueness to device descriptors. Do not merge

* commit 'c1e0015ec3dfacc137cb500066020b25f18ecbb7':
  b/12068020 Add a way to add uniqueness to device descriptors. Do not merge