Comment 1 for bug 1888021

Let's make sure this this gets backported before we release the next 2.8.x or 2.7.x. The fix for bug 1869116 broke commissioning (the test portition) of the arm64 node in our CI, which is still testing with bionic.

I did a test run with this branch, and it looks like it fixes the issue.