Merge "Return correct error code when finish input length is too long." am: 90657bbeab am: efea269a75 am: 18e3e2a66f am: 67d5ddde7b
am: 98ac79186d

Change-Id: I7306bc7d6888a5680765ce5ca79e2631d17923ff