Merge "Remove duplicate entry." am: 0c026d96ce
am: 9f7f5d9706

Change-Id: I7b47df38acd28f40bc2e9dcbd9e01e8334155fe9