Merge "No subdirs." am: 546f2d3067
am: 16f2ecf547

Change-Id: Ie35f3d3cea07b5e534fc5c793c72b7f52f74a23f