Import translations. DO NOT MERGE
am: 300ad2e4b0  -s ours

Change-Id: I6ecb8388aa2baa4733d75cee4628397e9d68e586