Import translations. DO NOT MERGE am: 6b7911ae4c  -s ours
am: 239809dea8  -s ours

Change-Id: I3bc6484686f6c5245c8e7008b0bb09b362967aa4