Merge "Revert "Change input injection security model to require INJECT_..."" into tm-dev