duplicate class from merge

Change-Id: I921b3d2a20c7957bda397beb15a0dd82f95a928c