Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev