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: Idd0d6ee249b61a2ac213c98d1d45426eb1f21ab6