[automerger skipped] Merge "Delete directory creation" am: 0d05cce083 am: f83325ec6d -s ours
am skip reason: Change-Id Ib4ea98aedef629dd9a2a8764cfd91284a38ba596 with SHA-1 89e09b58d6 is in history

Change-Id: Id729e83b141ba9d8570f262dab62f63866ab3b8d