Merge "avoid generating reserved local MACs"
tree: af8b51d56d68140cdc7d2c28676815e78c57651e
  1. core/
  2. services/
  3. tests/