am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 am: 60660ab0f4 am: b64b6f45f7

Original change: undetermined

Change-Id: I50686dcf5f2c727500863610a60f294246bab181