[automerger skipped] Import translations. DO NOT MERGE
am: 8ffe6cafff  -s ours

Change-Id: I1ee7512890db3973092df710b1126dd3f4f8da4c