Merge "Added LargeFinishInput test"
am: 0cd9dd3893

Change-Id: Icbee15dfb693ac1e39fcdfd6007bddcdd9edf294