Import translations. DO NOT MERGE
am: 34ed20bc81  -s ours

Change-Id: Idfa356ca0157a5e81d773e047ae343cdb875d41f