am 515d25e7: (-s ours) am 840af707: am c1e0015e: b/12068020 Add a way to add uniqueness to device descriptors. Do not merge

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