Merge "Remove subdirs" am: adf8208c52  -s ours
am: 73eaa91e0a  -s ours

Change-Id: Ic0a46fda2ad8b9f80a392e76c64c795664a8ef16