Merge "init: if vendor_init can read a property, let it be a trigger too"
am: 76b4299943

Change-Id: Ib18946c3847d59e186dd517d87816b1f908cb4a7