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

Change-Id: I38e96048879a413b1a197c654138cc93df6b816b