Import translations. DO NOT MERGE
am: 08838a1c53  -s ours

* commit '08838a1c531f8b6a1017ea6a4a736af2f2e30ef6':
  Import translations. DO NOT MERGE

Change-Id: If796c154acf226b796225d5fac316763a066bd9b