Merge "Use new version of A&AI APIs"