Merge "Don't get application info for the system" into nyc-dev