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

Change-Id: I598ce18a255b591cea30f58d8e686b564e4ff488