Merge "Don't reference directory that doesn't exist"
am: 949a78c265

Change-Id: I9677c8d72d3fd05126aa71cedf278c60e093f909