Merge "hal: add feature flag to enable instance id support"