Import translations. DO NOT MERGE am: cb6b15bbf1  -s ours
am: bcfd940be8  -s ours

Change-Id: I561c7959644a4bec74f9922b051fc547f33bfd97