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

Change-Id: I4e81a9cebbaafb9d7f1b594a775da3c66d109825