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

Change-Id: I563ada2b40d0bfa0379ae24d92fd649ab7a04dd1