Merge "Remove failing testGetHardwareAddress_returnsNull test."