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

Change-Id: Ie3b2c1980410e7542b28154294d238377a2ed6b8