Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev