Two phases to set the password for disk encryption am: 92c5eeb467
am: 4e44272c3d

* commit '4e44272c3d1e2f5c0040acefc3812781aeea1736':

Change-Id: I0eb0825eee3faffb27736cdaf92b98983369ef47