Merge "Fix a cts crash around proxy class fields." into mnc-dev