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

Change-Id: I44bf4c449a3b658a02d124240d15003229ba865b