DO NOT MERGE: Fix XPointer paths beginning with range-to am: d1af1e5178 am: ebbd06c82f am: 51a0bc7416  -s ours am: 047a21b3df  -s ours
am: c013fabd0c

Change-Id: I243b5f7f2b7479a0d5b1bab31618979c461f76a4