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

Change-Id: Icfff13a7c7e925205e89e26bfdff5f81e1ff5dca