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

Change-Id: Ia8df956d43870775b9a0a26b1ce60e1fc1ad389e