Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: ChangeUpdatedListener: Extract PluginConfig to a local variable Remove unneeded finals Change-Id: I4068ea22e4881353eb5244735166cbb1c2fae497