Merge "Ignore outputs with direct flag when selectOutput." am: a1270b044b am: f3bcc30de3
am: 5928ec9661

Change-Id: Id97fcda0eb511f0711cd0adc93763d46c940cf4c