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

Change-Id: Ifd79b8618022e2ae80e21af4e0677f0049304f33