[automerger skipped] Import translations. DO NOT MERGE am: 1308522cd5 -s ours
am: 5dfae2112f -s ours
am skip reason: subject contains skip directive

Change-Id: I530353e1dd3e51b080d22bd619ba362b58da9ee2