OK, so the July 2016 contribution cannot be a rollover and is therefore is a totally unrelated HSA contribution for 2016. It's extraneous information with regard to the tax treatment of the distribution for which you received the 2015 Form 1099-SA.
What is the code in box 3 of the 2015 Form 1099-SA?
