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

Change-Id: Iad142f929b5d366c24b93fad5e27a232964fd0c5