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

Change-Id: I61245b4c255cb6ddceb8d5d504eb4770ee7807ae