am 6dcf3759: (-s ours) am b6c936bc: Merge "Revert "Complete Sync shouldoverrideurlloading by cleaning code"" into klp-dev

* commit '6dcf375957520acb293fbe1a9288c3133df7c40b':