[automerger skipped] Import translations. DO NOT MERGE am: d7efca3250 -s ours am: 071ff1cef4 -s ours
am: ad205aa3d2 -s ours
am skip reason: subject contains skip directive

Change-Id: I98614d02fd53483d62b9c21a4a4756bb1ee6198e