[automerger skipped] Merge "Input tests no longer use test_per_src" am: 4cd25fc2a5 am: e525db5e7c
am: 1239d1d2ec  -s ours

Change-Id: Id583d05ccd8e9051d51ce0d4b8d0118b3b17cd5e