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

Change-Id: I9c610edcb433ab7b3e8119a816f6107ecc659cc9