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

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

Change-Id: I6c6aba077de8a9cb51df7ef55213ea750027278e