Merge "Remove references to non-existant directories"
am: 10ada2f2c2

Change-Id: I98549ca9cbf3e5b371e9da29a52b9f19312ec122