Merge "Swap the order of synthetic password wrapping" into oc-dev