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

Change-Id: I11f8cd2260d0cc0995756eeb82293c20e59d4b88