Merge "Remove references to non-existent directories" am: 6e11707f06  -s ours am: 37d983d382  -s ours
am: 3c356462ce  -s ours

Change-Id: I053d5603ecd39ed396352bc38dcfca83bbe5da7e