Import translations. DO NOT MERGE
am: 9223c18a08  -s ours

Change-Id: Idc577e2c053bc65b9d942daf0c9b618fd8f9c7bf