Merge "Update ahat version number to 1.6"