Merged two components into single one to have single source of truth. Also this may fix some go-rod test problems. Change-Id: Iffa86d1b3c24a0e2a551335ecda721a93ff616e3