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

Change-Id: I5f905e99910b144c36c87830712c894cbf18f6a2