am 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev

* commit '408e663712b7f807ff1a0859c636e2dc4f53422c':
  Correct algorithm property name and clarify javadoc description of device unique id property.