Merge "Minor fix for testShouldInterceptRequestParams" into lmp-dev