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

Change-Id: Ib5ba75e187b7e13a4471dde6085ef0e657271584