Merge "Reland: "init: run property service in a thread"" am: 34f2537393
am: dab12cfbcc

Change-Id: I3335d9c568fe9dac01b77690454c830249106f6f