Merge "Simplify dependencies in dspr2 related codes"