Merge "Prepare necessary data directory before loading persistent properties." am: 399bd0866c am: e1f216cc4d am: cbe1f6b1e4
am: faec65d7c3

Change-Id: Ie8e0bcc05bdf83351b3bfb73309c1b00eb511e30