am 5db0897c: Merge "Load the persistent properties after decrypting the /data...
am 5db0897c: Merge "Load the persistent properties after decrypting the /data partition" into honeycomb-mr1
* commit '5db0897c':
Load the persistent properties after decrypting the /data partition