Merge "hal: miscellaneous fixes"