Merge "init: Fix sync issue on property trigger. am: 876ad4571e am: c86dbc9a07" into nyc-mr2-dev-plus-aosp