[automerger skipped] Import translations. DO NOT MERGE am: 84510aaf13 -s ours
am skip reason: subject contains skip directive

Change-Id: I546f3bca1448d3c6e03839d47303c6865c9f16a3