Merge "Update to v13 A&AI APIs and correct service name"