Merge "hal: Add change to remove the usage of older legacy property"