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

Change-Id: If0fdc7bd46f711714986440a9a905f2ccb154830