Merge "store the hw addr in the extraInfo field of ethernet NetworkInfos" into ics-aah