Merge "MacAddress: address api review comments"