[automerger skipped] Merge "Change finish input test to avoid large sizes." am: c24d51fa46 am: bf1591fd91 am: 934b414db6 -s ours
am skip reason: Change-Id I2460106cf918e44ea5eeac5c518a89c311756eb3 with SHA-1 c78dc91896 is in history

Change-Id: I8a7fa3da1a943a7d00e9d02ce0baf8e3fec4fd60