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

Change-Id: Ib6e9917c555ab4ef5769aaca1ef6987dfbc185c1