Merge "Fix spelling of Locator in srcgen code"
am: d943b6abff

* commit 'd943b6abff1cccd383dca1dbfa555d9408c9ddd2':
  Fix spelling of Locator in srcgen code