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

Change-Id: I7c8f10af2c5b8514865eb83a49bede123f3403a3