am 68df4bd0: Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc-dr-dev

* commit '68df4bd08bfb550456cc8edb19fa894a124db38c':
  DO NOT MERGE init: Fix parsing of multiple property triggers