Merge "Allow INVALID_INPUT_LENGTH for oversized messages" am: b397fc8e88 am: 6194c02c64
am: d65e81b1fb

Change-Id: I56bf87c501acc5517d6d6bfbe2cd33aae413a81d