Merge "init: Handle properties in the background of calling fs_mgr" am: 84fc269b6e
am: 3a12494dc5

Change-Id: I10e8bbd3df9def7f75a3fbec6d80603f2adb003e