Merge "hal: add support for kalama aim"