Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev