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

Change-Id: Id195e44b72fb0f92f4b12fb9a269b39227d1ee0d