Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev am: 7723aed494
am: 4aa94a7c50

Change-Id: Id2d785bd171e9ef5803b65cb6f4b82ae93005701