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

Change-Id: I199e82f692b570d63c42c5517f5934b78a494009