Merge "Update LaaS Container Build context"