Merge "Add a missing default value for OPTIONS.extracted_input."
am: 2c280271ac

Change-Id: I89aeb98b2ce040801de5daa4f1856b93c9afadec