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

Change-Id: Id8198edf7ccf6af0914d5ecc3821a23d7f00832c