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

Change-Id: I53c0c14f10803dc022391fa8059936fe6def2503