Import translations. DO NOT MERGE am: 491c2654b7  -s ours
am: 8747d9e3b5  -s ours

* commit '8747d9e3b5ebe9350de4a315691c384a979abda9':

Change-Id: Ice0c11e531105d316a0515a85be6a13ea42e732b