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: 56a9395a am: 2a107633
am: 02826bb3
* commit '02826bb3':
Two phases to set the password for disk encryption
Change-Id: Ib4dcc51963c1edc8410031a5dcb7c4eb0d876e16