Merge "Use OS_CLOUD in sample local.sh"