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

Change-Id: Iffab4f642ffe606189b50c8409150def00cd6e58