Merge "Added LargeFinishInput test" am: 0cd9dd3893
am: 2b7a5caaf1

Change-Id: Id04fa699dec89bfd19f5698bc4e93b430a74bdcb