Revert "Revert "Revert "Revert "Replace field injection with con..."

Revert submission 3342809-revert-3340780-revert-3344343-revert-3343291-k2-upgrade-wpp-KWLCODKLEN-OROSEWLQYI-UXWYBKSHRY

Reason for revert: One more try

Reverted changes: /q/submissionid:3342809-revert-3340780-revert-3344343-revert-3343291-k2-upgrade-wpp-KWLCODKLEN-OROSEWLQYI-UXWYBKSHRY

Change-Id: Icbbd8abb17846ae626091c941bda7a7509c72280
Merged-In: I49dcf5fa23ed7e902b67c371a963f37d36d524d2
Merged-In: Ia8750cd6b654bee82d4f2907cfb3b9ebd56297fd
4 files changed