am a2e765ef: Merge "Update the encryption password when the device password is...
am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb
* commit 'a2e765ef':
Update the encryption password when the device password is changed.