Fix duplicate entries

Change-Id: I63e7cbb62c40587eb4db1e0512d32d4f8cbfba03