Merge "Don't reference directory that doesn't exist" am: 949a78c265 am: 3c87d9716e am: 314b847825
am: f3137f7965

Change-Id: I8c4d737231644fe039eb5db405fb8ce9021fe5b9