Merge "hal: Update local cache only when mxr ctl matches"