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

Change-Id: Ib4a837ef693ad8a41de54f8f39a83e8c1fc5cc5e