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