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

Change-Id: Ief01f2ca140632177fe0987c0a3b0d9662c1e862