Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am: 603544d4c4
am: 14a826380d

* commit '14a826380d12f4a5c48c1f9fb97b3b24ebddf0c7':
  Fix delegation of methods within inner static classes