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

Change-Id: I5cf5de24cf3e0b1c5203b18922c3c6b96e7491c9