Merge "Revert "Revert "Fully support static encoded fields."""
am: 86060f93c3

Change-Id: I19d9a866226b355cd68a1c72b53b6787a0b6b8d6