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

Change-Id: Ica8bc3bae0b50f1a1682b1fa7f392e91ffa953b8