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

Change-Id: I52186e310daf66bd3b210f180acb36c8a4894ae7