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 Change-Id: I5386f5e07905663dce039366ebc2cac610814af1