Import translations. DO NOT MERGE am: ea1e82088e  -s ours
am: 7d048b49ad  -s ours

Change-Id: I98c7e4be1c71c9520d4ce345114f115decbd8633