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

Change-Id: Id46da3cf150cd716bce651c1e2583626637bd4d1