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

Change-Id: Ia48350c386e665ebeecb095a58e2aca64f1a1312