[automerger skipped] Import translations. DO NOT MERGE
am: 73fa5066bf  -s ours

Change-Id: I17eef93bbad57389affd169127241ceca4f1f801