Merge "Upgrade bazlets to latest stable-2.15" into stable-2.15