[automerger skipped] Import translations. DO NOT MERGE
am: 92f1a41bc3  -s ours

Change-Id: I313359ab650006fbde70cf92181c129a13bf42ad