Merge "Remove reference to directory that doesn't exist"
am: c864859256  -s ours

Change-Id: I4d3c0a4706267b603d82469db2a4f51cd3aa893e