Merge "Reland: "init: run property service in a thread"" am: 34f2537393 am: dab12cfbcc am: 148109483f
am: 06adc86887

Change-Id: Ief2d9e2543d6538d673b30ca0f383ebc37e5a8ec