Merge "Fix missing "property:" string in the event trigger" am: 7e132d0423 am: ebab28883a
am: 549a6a9004

Change-Id: I1801322a07aeae60ab4589c8c76ec042fada57a8
tree: 978b1f49d55a019e0a2683ac7356717608da2be3
  1. service/
  2. PREUPLOAD.cfg