[automerger skipped] Import translations. DO NOT MERGE am: 591556a930 -s ours

am skip reason: subject contains skip directive

Change-Id: I5af460a3e7276ec3acf5f0f57f20954b0d193fae