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

Change-Id: Idc20b9a919ce82cdf8507af6d4551eb8ff7aa3c9