changes for Jetson
changes for tk1
merge