Merge "Remove references to non-existant directories" am: 10ada2f2c2
am: b94019f32f

Change-Id: I1175d893b6dd7f91a63b2a706835f3fd84ab153d