Merge "Swap the order of synthetic password wrapping" into oc-mr1-dev
am: b3ce6d33e0

Change-Id: Ie63ae6deb6a0454aa32a93f9aa867189c7390cdb