Consolidate resync scripts

Change-Id: I4a0dac648259cd1b29344f6e2fc46e5b98e0240f
Fix load samples for now

Change-Id: Ic3f2f916ca861dd11ebf41a181b978dd8798074e