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