Fix missed Location references in the database [story:44433327]
Merge remote-tracking branch 'google/next'