Merge "Fail explicitly on length overflow." am: d46eb21906

Change-Id: I3722824bf8aad86ced2765a8eda8f6cd54fba805