am 6d38c46e: am 3ac8148c: Speed up database update

* commit '6d38c46ea04674a1cbfafd04a0313a65f915c9f3':
  Speed up database update