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

Change-Id: I4192c214f578f5b9c23213acde777699a6033223