Build with API version 2.13-SNAPSHOT and adjust to recent changes Change-Id: I8534c763a10f7751411c259faaa176a9ba2e6d0e