Yes.
Except next year you will want to eliminate one of the K-1 input forms since you will only receive one K-1 in 2017 (assuming there is not another technical termination).
*A reminder that posts in a forum such as this do not constitute tax advice.*
