Merge "Use new params for platform key protection."