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

Change-Id: I0b4c3cb51b6e79679da7946cf85ac467b7f3a14c