Merge "MacAddress: add @NonNull annotations" am: e65a016d76 am: a7c125e5b2
am: 697b7fe9e1

Change-Id: Ib525e2429609ce12c2be5bbeacffa217b65bebe3