Revert "Squash Commits from RazrQcomDevTeam"

This reverts commit 0cd8329449f15dcbe85a2bd2e91239c20c3ce4bf.