Cloud Endpoints commit #2