[automerger skipped] Import translations. DO NOT MERGE am: 07808d14 -s ours...

[automerger skipped] Import translations. DO NOT MERGE am: 07808d14 -s ours am: fa6604e6 -s ours am: ff223a25 -s ours am: dfe9843c -s ours am: 57ae430b -s ours am: 5e631572 -s ours

am skip reason: subject contains skip directive

Change-Id: I9e4f739fbc342c5dc0c73e98b31f5c6c0cc2126a