Merge "Fix issue where can't FR Volantis if OEM unlock is enabled" into lmp-dev