Import translations. DO NOT MERGE am: 09bd03ba04 -s ours am: 1919e72747 -s ours
am: 02ec9a9903 -s ours
Change-Id: I43e621e95492a08b03f0cc82a2b913fe3b9b20dc
This commit is contained in: