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

Change-Id: I406e45af16cc573953965aefea5587f3951c794f