[automerger skipped] Import translations. DO NOT MERGE
am: 8222077fc4  -s ours

Change-Id: I8efeb07cc612fc7f9389e23d4a8e3b0986f1d7b5