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

Change-Id: I6ba87d5781c449175da82feea05a92859ac90d01