Backported obfuscation changes.
Backported obfuscation changes.