Merge "Reduce scrypt time in synthetic password flow" into oc-dev
am: 71e0fcbf2f

Change-Id: If8b4d7845160bc0887f5b3b535135849d00b6d01