Import translations. DO NOT MERGE am: e879add49c  -s ours
am: 61eb263fcb  -s ours

Change-Id: I1749283df322ab4299d7886c721b042404926dc0