Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Upgrade bazlets to latest stable-2.16 Change-Id: I348d56c068a917627bbe743da7ade399ae2f8a54