Merge "Update ahat version number to 1.2." am: 32e075d17d
am: 951c828d47

Change-Id: I0fc6eb166f281c89fad4db4cb972dd7fc0ce0048