Merge branch 'stable-3.1' into master * stable-3.1: Upgrade bazlets to latest stable-3.1 to build with 3.1.10 API Change-Id: I3ea050e71dc1b9799edadf20d536ab59c13524ed