Merge "init: Fix sync issue on property trigger." am: 80d2f01fbf am: 65016074c2
am: b94063edbf

Change-Id: I65c9d1b2e17550d73a6a45d44e6094d79956524b