Merge "Add CTS coverage for MacAddress" am: e264485c55
am: 5e62adab76

Change-Id: Iab010dea545323650a7d03bf14edc84c69129f81