Import translations. DO NOT MERGE
am: 8cb138efcf  -s ours

Change-Id: I079b2cd5528ad4958e7b6e75d712b3abfb7a0518