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

Change-Id: I89cb3f80d49bd4778d608bac5053b584f838077c