Merge "Add an init encoded fields threshold to compiler" am: 8054c1d7da am: c8a6ede38a
am: 0d3634799d

Change-Id: If8920c0ae0dcb70b5744d34ef2fbbf343cf8bcf0