DO NOT MERGE: Fix XPointer paths beginning with range-to
am: d1af1e5178

Change-Id: I049a978fc512442c9cac29731d1e2a6f07ead991