Revert "Rebase Cradlepoint diff over v2.90"

This reverts commit 567116b2c00761fdbd6aa7365ecca637f15b868d.

Change-Id: I4dff0e9eac08e62b606897ce05f59595701d97d1
21 files changed