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

Change-Id: I1996ac258513a867a73a195d7a16262ed8298cfc