Add missing import_opt for flat_injected

Fixes bug 1131891

Change-Id: I993798abea27b8d37efe5d3c122a490d85e192a8
Merge "Add missing import_opt for flat_injected"