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

Change-Id: I718a9e5f97c5e16352367b585837aad319990425