Merge "Revert "init: run property service in a thread""
am: eb94026231

Change-Id: Id97fd03b7b00f089075681e0077f1536ae830932