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

Change-Id: I21815b743747e3b5f800cc0c2bd4e8313f671503