[automerger skipped] Import translations. DO NOT MERGE am: a0783f9dc7 -s ours
am: 4f62be24cc -s ours
am skip reason: subject contains skip directive

Change-Id: Ie78e091a1daacae8a84e87a506af671565b2f3dc