am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1

* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
  Fix NPE in trimV4AddrZeros.