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