Merge "Fully support static encoded fields."
am: 673253e162

Change-Id: I5d6777d07f80ce89cbf1977280eca4efddb4c9ef