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

Change-Id: I5d18f63d16b66df4db17324b17a62fb1bfb26c87