Merge changes from topic "sync-cleanup"
am: d356071fed

Change-Id: I2b5277902d915378dab7bf68e81f92eb8c57db85