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

Change-Id: Ifabd2ddd2b730664c566c6fe53c114efd4ca366d