DO NOT MERGE: Fix XPointer paths beginning with range-to am: d1af1e5178 am: ebbd06c82f am: 51a0bc7416  -s ours am: 047a21b3df  -s ours am: c013fabd0c am: 0f53c4649f  -s ours am: e6fc33857e am: 0835163243 am: 2c8ac46c37 am: ebdc78d035  -s ours am: 3da6545401
am: 75d77af0e7

Change-Id: I5a1c07be502cb4ac1fed546d6f93865d1a4e893a