Import translations. DO NOT MERGE am: 8bea919d37  -s ours
am: 3f7cd6f73b  -s ours

Change-Id: I471ace1f6bfd71059e2c3f713d6385064988ada3