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

* commit 'a6bc1fea1853f917d57f78233fe312ec19343a2f':

Change-Id: Ie434a2b1ebf510ebc7e76f234eb305dbda65f282