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

Change-Id: Iee3007fd2d8ca0c07ad802a1a5ecbdcdd83427bf