Merge branch 'stable-2.9' into stable-2.10 * stable-2.9: Consume API version 2.9 Merge made by the 'ours' strategy. Change-Id: Ife4ea0b62d025dd14ef84004d5be36b3900773e1