fix already defined with olympus

Change-Id: Id5089971648ae026154a6dc0db56fc50960d589d