Bug 1342269: Do not set mac_address if not needed, instead leave it unspecified
Bug 1342975: Couple of bug fixes in schema transformer

Closes-Bug: 1342269

Closes-Bug: 1342975

Change-Id: I8b6b1aa4a0f779eadaff102ead30315fe16ac248
Merge "Bug 1342269: Do not set mac_address if not needed, instead leave it unspecified Bug 1342975: Couple of bug fixes in schema transformer"