The fix for the Database API goes to Gerrit separately. Its filed
under #60457.

Change-Id: I8191ec2179c623a127d7325460bc2d252dbfdc5a