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

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