Merge "Revert "Fully support static encoded fields."" am: 0a87f31513 am: f1dcaa29ed
am: d380c80adf

Change-Id: Ie379bef1d36893b65ead9d4a6f984e27cf995374