Merge "Input tests no longer use test_per_src" am: 4cd25fc2a5
am: e525db5e7c

Change-Id: I13e85c56c00028cd8b1dc2928f795cd6ac081e2c