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

Change-Id: I11c23e91d8147108406b9bcfe188f309a644fcb2