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

Change-Id: I5b76f8f5601258880b14a34a3ad9fb8a0a5b15b0