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

Change-Id: I72dda41a53e95420653027176b04c7d359fa8e71