Merge "Return an empty list when the requested node is not in the tree" am: 862fcdbf22

Change-Id: I44e9d5b77d9cfa88ea4b3d572593b1a8be0175e5