[automerger skipped] Import translations. DO NOT MERGE
am: 454d6a1e4f  -s ours

Change-Id: I76a97e7ada494cf39cf6024986936142c466f289