Merge "Revert "Revert "Fully support static encoded fields.""" am: 86060f93 am: b19e01fb am: b3814186 am: 301d5d25 Change-Id: Ifa822e08f06ac6c86a201d7b5399a3d609d59cdf