Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: 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: Id179a6b1f1778c8f6a99fd78d6a08b5456763b34