init: Fix sync issue on property trigger. am: 876ad4571e am: c86dbc9a07
am: c89b04a9ba

Change-Id: I88230e993851d3a719dce70c9dd15a843260caaa