Merge branch 'stable-2.9' into stable-2.10 * stable-2.9: Avoid throwing exception due to deleted change Change-Id: I87fc07bd38aa07a02609d5d24afa101366f42406