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

Change-Id: I125d076cd22858b289e36e8b7a5e6ba367143e66