Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Upgrade bazlets to latest stable-3.1 to build with 3.1.12 API Use username from notedb in serviceuser.db Upgrade bazlets to latest stable-3.1 to build with 3.1.11 API Change-Id: Ia046a448890d5e8220fb67144e00c284bd7d62ed