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

* commit '603544d4c42cd8e0cc46da04f28a8fead64665e3':
  Fix delegation of methods within inner static classes