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

Change-Id: I71379e833219cf4fa8a4b1c79f8feb73a3218bde