[PR] Update with upstream changes through JetPack 3.1-beta