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

Change-Id: Ib636e050c15f901f9b8f31095e2a5b0aad3512d3