Merge "Add locking around boot image generation."