am e0502615: am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'e050261533ed4fff1c86a0553a5858e22d0305a9':