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

Change-Id: I635728f71055e08ed552a05b017005da7dd33155