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

Change-Id: Ic7a8b67ed61ce47d48e341d5ea4e19d26e516748