Merge "Remove references to non-existant directories" am: a3e78ca7d9 am: 55d22aeeb2
am: ad58d4f52d

Change-Id: I1de22b47898a9953ecd8fbde0b016f890ce32697