Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002
am: 4f05f46f13

Change-Id: Icce1e14fae4293d747d0f9a57c99bb52fee31ba0