[automerger skipped] Import translations. DO NOT MERGE am: 59346999ba -s ours

am skip reason: subject contains skip directive

Change-Id: Iafb66059051f6558d1c1fb8267d45038e4c86e3a