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

* commit 'bc7cfa8fcce8b09d308a7e511c5a2d4de530676a':
  Two phases to set the password for disk encryption

Change-Id: Ifcde4025a0ce196c8208f802a6a5dfb4a24e2a0d