Merge "Remove references to non-existant directories"
am: 1fcc1ade6a

Change-Id: I8ff4f409bcf31cef22bfc4943417ddcbaeb7a7cf