Merge "Self assign controller MAC when cannot retrieve one from host"