Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Set current project name for EventListener events. Change-Id: I2dedf48a7200a6179c7157b505bc845ebbe3b921