Merge "Annotate Application with @CallSuper" into mnc-dev