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

Change-Id: I99fcb1312c2827cfaa6dc514eb75c064aa74ddf2