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