Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Set current project name for EventListener events. Change-Id: I159edec0a9f740fd7adab6c7768ac12b42c7500d