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

Change-Id: I63b409fddfa398817b505922f3fbc12ba9a3edb8