Fix world-readable permissions due to sqlite race condition - DO NOT MERGE am: cccf840917  -s ours am: fe453fb752  -s ours am: 07b874ecae
am: 8e2817f3bc  -s ours

* commit '8e2817f3bcd673f93651c6f0732cd0a3cb3bbd71':
  Fix world-readable permissions due to sqlite race condition - DO NOT MERGE