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

Change-Id: I99f7783b93ab32755dd551797104bf4895fdc0a1