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

Change-Id: I5b5bf9685ae2936ee28a5df3d212f7e383dd8281