Merge pull request #7761 from jordan-woyak/gccontroller-minor-cleanup HW: SI_Device_GCController: Minor cleanup.
