Implement folder sync correctly.

Change-Id: I9f9fde6bf2f991873a04360be43ee669a97cc1dd
5 files changed