fix merge: removed duplicated entry

Change-Id: I900d03e8629d541912e7bf95a054c305b461978f