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

Change-Id: I5ebceecde9c234728d92f5b2a5a90a9da6b1539d