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

Change-Id: I8167ff07cf2743b412f7eeb0b7d40fccb8b9cd32