Merge "Remove references to non-existant directories"
am: e8a9a230ac

Change-Id: I7012550cd861f06b6076513f7e3155394885805b