Two phases to set the password for disk encryption am: a363036b44
am: ad4dcc2ff6

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

Change-Id: Ic4ba913e285ac3583f8c29227532c4c77094763e