Import opts and fix command

Change-Id: I61595beb5430d10b943aa36919e9f551d10f7134