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

Change-Id: I20f93afec151e4e2d2716b03ca2fcc2deb6b61a1