Merge "No subdirs."
am: 546f2d3067

Change-Id: Ia5ec8f33df1f5ace737cf267fcaacdb59b2002fd