Merge "Add the new key purpose to types.hal as well."