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

Change-Id: I166716bfb6bcb4ea9441b059e270d83862f12d10