Remove duplicate code The duplicate breaks build. Change-Id: I0f16761c4bcb8563402a664013429403b883c2e1