Import translations. DO NOT MERGE
am: cbc4580be5  -s ours

Change-Id: I8878b781081de67a5a8c0bc88ede00da8b1896f7