Revert "Merged PM Driver Updates from Aurora 3.5 thanks @neobuddy89 for TIP."

This reverts commit f1e12360ca23115a5de666cf1a76d18619b1f780.