Finer grained ODS import mode selection.

Change-Id: I18520837f8d25103bf8482a0204b8a7b7740feb1