Merge "Update ahat version number to 1.6"
am: fe62f67269

Change-Id: I3bde2643fd654adda423373a87271def94f6aea3