Merge "Fix code coverage for apps" into nyc-dev