Merge "Remove reference to non-existant directory"
am: d96e627971

Change-Id: I7a247f4d1d00ac6d076b25b7fe231eb28ab3c848