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