Merge "Remove reference to non-existant directory" am: b4eea2ce03 am: 093b02c8df
am: 73bafb0641

Change-Id: I36925b9a138ff3f6afa180ab8b506701f2ddd934