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

Change-Id: I781fb454612635a06dea763984a2b143a83a6f70