Make it resync and remove import_opts

Change-Id: If40c429e80e0308e61c38d1aa2abfaba5d20dba6