am 3d3e9b0e: (-s ours) am 3d4c8d8c: Merge "Fix shouldoverrideurlloading." into klp-dev

* commit '3d3e9b0eb714fa04e6606a89747aabb223537054':