Merge "Fully support static encoded fields." am: 673253e162 am: 55cab721a3
am: 58fb0ef79f

Change-Id: I0633d103d0b9ba65538852f5b8c65deac9fc7766