Merge branch 'stable-2.10'

* stable-2.10:
  Consume API version 2.10
  Consume API version 2.9

Merge made by the 'ours' strategy.

Change-Id: Ic3db1932a0d70542df66847f622f13754c00a3af