Merge "Change finish input test to avoid large sizes." am: c24d51fa46 am: bf1591fd91

Change-Id: I54c81144304d5fe8123e1009e5b1acb49909c1d0