Merge "Reject any length mismatch, not trying to be nice and proceed." am:...
Merge "Reject any length mismatch, not trying to be nice and proceed." am: 34f9c544 am: 7fd0eb2e am: ecc10808
am: 310f6fb5
Change-Id: I3522b3d0f007f6e9fbeacd07cd7e93efc54ea9b1