Merge "hal: Dolby trumpet security changes"