Merge "Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into udc-dev