Merge branch 'for-4.17/sony' into for-linus

Pull support for NSG-MR5U and NSG-MR7U devices.