[automerger skipped] Import translations. DO NOT MERGE am: 0517d3d5e5 -s ours
am: 127438c2ef -s ours
am skip reason: subject contains skip directive

Change-Id: Id53f56adc839f5f72a8f591b6dbf723c0d543377