Merge "Build with API version 2.11-SNAPSHOT"