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