Merge "[RTT2] Fix build failure with new MacAddress"