Merge "Fsync directories before delete key" am: 7573874d3f am: 3a38070bbf
am: 08613423ee

Change-Id: I6007af911ba3fcafad590d33deea25a5c55b03c3