Merge "hal: remove/rename properties violating sepolicy"