Merge "init: make CheckPropertyTriggers() more efficient" am: bc1d0b09cc am: 9bbb9fd625
am: b6d6f6851f

Change-Id: Ie9916e1a30fb9d510da4e83bfc03aecf1ad716ea