Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 033ee4cfce  -s ours
am: 3774d51fd1  -s ours

* commit '3774d51fd185ee591a064fd17e0d288ec600e350':
  Import translations. DO NOT MERGE