Import translations. DO NOT MERGE
am: 5ffe930607  -s ours

Change-Id: Iaf6552a6a14beb2dc5504a7229549a8ff36a6c0a