Merge "Two phases to set the password for disk encryption" into nyc-dev am:...
Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a am: d365ddbd
am: 5f0856af
* commit '5f0856af':
Two phases to set the password for disk encryption
Change-Id: I33698902b9eb6345ee8eef5deae043132d7eb80d