Updated for new Play Services and CCL