Bug 914942: uplift to the leo branch
Merge pull request #13402 from fabi1cazenave/uplift-bug914942

Bug 914942: uplift to the leo branch
Merge pull request #12134 from fabi1cazenave/macAddress-bug895739

Bug 895739 - [Wi-Fi] MAC address is always displayed as "not available", r=Arthur(cherry picked from commit c0dc159a1b0b746053c2ca8d6405464b40b8dbab)
Merge branch 'v1-train' into v1.1.0hd