DO NOT MERGE: Fix XPointer paths beginning with range-to am: d1af1e5178 am: ebbd06c82f am: 51a0bc7416  -s ours
am: 047a21b3df  -s ours

Change-Id: I2e0fd4c8e9b6f9d01f201be8d9799e10f5d5d562