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

Change-Id: I3bd412eecc570cee7977c6192227f3dd5bebe583