am b36d9c3f: Merge "More accurate checking for overlapped ranges."

* commit 'b36d9c3f00e75dba464ff62eab94dd46d93ac94e':
  More accurate checking for overlapped ranges.