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

Change-Id: Ia6008f6bf76628c019d6102922653707e23a79ea