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

Change-Id: Iba11135fc660a92bde1ec8cae2d12e92dda4449a