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

DO NOT MERGE: Fix XPointer paths beginning with range-to am: d1af1e51 am: ebbd06c8 am: 51a0bc74  -s ours am: 047a21b3  -s ours am: c013fabd am: 0f53c464  -s ours am: e6fc3385 am: 08351632 am: 2c8ac46c am: ebdc78d0  -s ours am: 3da65454 am: 75d77af0 am: d0c95b5c am: 5ec8e667
am: a3d34e19  -s ours

Change-Id: Idf41eae4a4a6674593ba6ca076406c5449567d46