Merge "Add a comment on incorrect paths that are required for Q compatibility."