Merge branch 'stable-2.11'

* stable-2.11:
  Build with API version 2.11-SNAPSHOT and fix build errors

Change-Id: I77178c7aef65ee9ad41f2edd2dcd72e582bce0e7