Merge commit 'v3.4.4' into android-tegra-nv-3.4