Merge "Update preference to set password field" into pi-dev am: 13c45045de
am: 46ed260d0e

Change-Id: I5cecf70da96f7b30659b341f3bdae65fb6b491d5