Merge "Save password requirements on the right user" into pi-dev
am: f0db8fe188

Change-Id: Ibdc4a6b71b274a2da1c0d199a220c7957ffd637c