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

Change-Id: I1e6f0aca3351789ccd0eb3c68ab20e606ce7f9ce