Merge "Inject anonymous inner classes of injected classes" into mnc-dev