Revert "m7 common device updates"

This reverts commit 257d5cab7620ed8a33b202798de66ce83bfdf662.