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

Change-Id: I8071ddb3aeae68102c7ac699adc6092370c9946a