Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2523c61fb7  -s ours
am: 8613602592  -s ours

* commit '861360259234c33846d36ade8e90143d8c8eeecb':
  Import translations. DO NOT MERGE