Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: bd517fb3bb  -s ours
am: 8bfecc2521  -s ours

* commit '8bfecc25211524d60e26018da06a2f9dd30d3317':
  Import translations. DO NOT MERGE