Revert "Merge pull request #9732 from lodr/bug-868363-fixing-lint"

This reverts commit b74ba2afee31471e07903977bb2fb97fba2fbe30, reversing
changes made to 3479338df4aa24ff99df753d9fb88807c85f2589.

Revert "Merge pull request #9642 from lodr/bug-868363-wait-for-iccid"

This reverts commit 1960cd62d406e9e20c0ea658acfcecd92970d23c, reversing
changes made to 4e705ae77b41cad523c520e96e890932a3b8bd88.