am 6f9ba85b: am 1c52586c: Merge "Update zen mode and qs strings on locale change" into lmp-dev

* commit '6f9ba85b2dc7017e88a931423f64d45e8fb13fd1':
  Update zen mode and qs strings on locale change