Merge \\\\"Add missing dependency required for ahat-test.\\\\" am: c9c5fe47 am: 0fc2b06b am: 6d9f8527 am: ea268604 Change-Id: Ib91964cb7413be8852f4842bb1557a73677321e0