Merge branch 'stable-2.13'

* stable-2.13:
  Build with API version 2.13.1

Change-Id: I13b2820ee430008f5019ffef0614db200307a36f