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

Change-Id: I1366412b54b27d7f31111325d51278ed8104fbb4