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

* commit '5db0897c6530502e1343a75b258868122030e4a5':
  Load the persistent properties after decrypting the /data partition