Revert^2 "SF: enable frame rate override " b15ef13974e62fe2c93f6557222f9d8ed0b2cdb1 Change-Id: I0f0dc8268013159113f7ba8413bbd60d893d368d