Merge branch 'stable-2.13' into stable-2.14 * stable-2.13: PropertyExtractor: Add null check for event.submitter Change-Id: I3a443ba01fac120258d3599b5b73e4257a503028