Merge "Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev am: 947528607f am: 96d506af85"