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

Change-Id: I9dd0109be0d3ca965582b72f94ae271a8ac5f199