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

Change-Id: Ic7759c21e07806f3b87757c0f6e012ebf2e08c2d