Merge "Remove references to non-existant directories" am: a3e78ca7d9
am: 55d22aeeb2

Change-Id: Ic1ea0ea151d5ea08f40554e828d33a1401ec4851