Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Build with API version 2.13.9

Change-Id: Ie2608c64cb3af20f9f01cb8c6408412899ef10d0