Merge "MacAddress: add @NonNull annotations"
am: e65a016d76

Change-Id: Ia1ea828cfd33b5287639e4fd3ab248a58650168b