DO NOT MERGE: Fix XPointer paths beginning with range-to am: d1af1e51 am: ebbd06c8 am: 51a0bc74 -s ours am: 047a21b3 -s ours Change-Id: I2e0fd4c8e9b6f9d01f201be8d9799e10f5d5d562