set mac_address correctly

Change-Id: I911a2e0e8cf2f5d277bd4580ecac5ed22b576cd3
Closes-Bug: #1350335
Merge "set mac_address correctly"