Merge "Fix to invalid call to manifest.app_info"