Merge branch 'stable-3.3' into master * stable-3.3: Don't output directories during task walk. Change-Id: I022563e4fc002921524a31bdca7793e45c9bbe59