Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Set Gerrit to 3.0.11 Change-Id: Icb8f4c8b055360af3e8469f687b839a4bc8227ee