Merge "MacAddress: add @NonNull annotations"