DO NOT MERGE: Fix XPointer paths beginning with range-to am: d1af1e51 am: ebbd06c8 am: 51a0bc74 -s ours am: 047a21b3 -s ours am: c013fabd Change-Id: I243b5f7f2b7479a0d5b1bab31618979c461f76a4