fix duplicate declarations

Change-Id: Id0b516bbceb346fe969c48b7f19f835468a889cb