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

Change-Id: Ied4eb2aed709ef90008edf7c49509522e96eb512