Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev