Fix duplicated roots are shown am: e05075342a am: 3973d57226
am: 200e95df1b

Change-Id: Ia96c247c6c57f0828f69f1e032364c45023c6784