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

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