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

Change-Id: Ie77d935d5417155e3bb63de51aec4e03a2994d08