am 1dfe5210: (-s ours) am 1baffe78: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '1dfe52103f04675e0d7ee6b5e2a515cb6732403d':
  Import translations. DO NOT MERGE