[automerger skipped] Import translations. DO NOT MERGE
am: 6e411bbab0  -s ours

Change-Id: I5d4f0e64457b374f2b82297d656ce2ef77bbd39b