Merge "Add TEST_MAPPING for ahat."
am: a7552bd1c4

Change-Id: Ia00591d158422f70490c4497b15a5a85ed790725