Merge branch 'stable-3.9' into stable-3.10 * stable-3.9: Set Gerrit to 3.9.11 Change-Id: Ic65bd5761a040560c5b7af342787d473d42159d9