Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6d380e0b7f  -s ours
am: b633b4acb6  -s ours

* commit 'b633b4acb627efc699593ab1e286a17e893ae82d':
  Import translations. DO NOT MERGE