am 840af707: am c1e0015e: b/12068020 Add a way to add uniqueness to device...
am 840af707: am c1e0015e: b/12068020 Add a way to add uniqueness to device descriptors. Do not merge
* commit '840af707':
b/12068020 Add a way to add uniqueness to device descriptors. Do not merge