Merge "Fix NPE in trimV4AddrZeros." into ics-mr1