Merge "Fix loading root's children" into pi-car-dev am: 98ca83500d

Change-Id: I78de2798dbda7dbf79f6befa339db1546cb53fb4