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: Icd8c22f4791dd5ff2f15e43cdd0c0dfa879bd983
Merged-In: I718113e103da303ddfb102b73c95f9a9b25da132
Merged-In: I563eb2e6b10c98f9f60c9680e5f50ff0541ad7eb
3 files changed