Merge "Update bug for cleaning up swcodec dependencies."