Import translations. DO NOT MERGE
am: 836e990  -s ours

* commit '836e99036ce3b3b82e55b7cb0a6adb4c596bcdde':
  Import translations. DO NOT MERGE

Change-Id: Ieef812b9fda22332de0d36735064c223a8e03db3