Merge "Remove references to non-existant directories" am: 977698ff45
am: 0baccce0e7

Change-Id: Ib70e3546119862b74ac5faee71ca3d37f8813a56