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

Change-Id: I5ebf59fcd1172009fd89f6102080c80eec58cfb6