[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours am: 92c5a4fafd -s ours
am: 5e5109e304 -s ours
am skip reason: subject contains skip directive

Change-Id: I25560f44d5294349daa56773a40d4b24b82993e7