Merge branch 'stable-3.3' * branch 'stable-3.3': 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: Idd35ba419e2d0e873092cb664918595ed8f7e350