Refactoring out some params code.

Change-Id: Ie4268faeefd6858057c242bea98aceb3800cef75
4 files changed