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

Change-Id: Ia1ef5656f21dd6e87abbe207a60c68bfe5e78a54