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

Change-Id: Ic6f0e608317cacbf0a95e15909f89f0ec9314468