Merge "Add amphora update service client and API test"