Merge "avoid generating reserved local MACs"
am: 464e1b5e6f

Change-Id: Ia6d0eb0c5e8101d9c4b4bc63de79157f7d1c2284
tree: c6ae6cb7faca22ba0c61b24c4bb3a209cf8ae382
  1. core/
  2. services/
  3. tests/