Merge "Delete directory creation" am: 0d05cce083

Change-Id: Ifdeb86e57043fff6cfa58b8252af5d927c5e3fca