Merge "Remove references to non-existant directories"
am: 977698ff45

Change-Id: I4cab8e795c8eeb653053626e8ace18a6cfcc78f3