Merge "Fix ahat test"
am: b31d141d09

Change-Id: If7ddb88b4925109772d62636f6f4f4d41742f48a