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

Change-Id: I7fe49a30aea3bb153769ed2c2fcb0d0a632b7c46